Fixing tests and object interaction