Removed a method that was only used by a bad test
Added a lot more test coverage