Cleaned up tests and added bounce