Updated tests and feedback