fixing non-object issue
fixing tests
FIXED EVERYTHING (more tests yet to make)