More tests, start working on object creation