Cleanup tests and add prompt