Moved angle and geometry tests to separate classes