Refactored all tests, fixed bug with carres and added test for that.