Consolidated functions and upped testing coverage :tractor: