Refactored tests
Basic support for objects
Full support for objects