refactored tests and added object creation methods