Fixed test errors. Tried out bullet gem in tests, but those errors are more complex than I have time for right now.