cleaned up object files and added new tests