Added new objects, tests