Removed tests for old functions
Removed old function definitions
Removed old functions, added new ones