add validation (commit: dc9039a)
updated test (commit: fe76893)
updated test (commit: b8e3fa4)
fix test (commit: e7eacd5)