fixed issue with Objects and added minimal tests