amir, ashok | #123 | refactoring tests to use builders