Tests complete for currently implmented functions

Going to clean up the repeated code now, and retest
Refactored existing 4 methods
Non-interval code working