Fixed tests with new objects