Cleaned up unit tests (removed unused calculations).