fix method name in tests, crazy math cleanup