added some more tests to objetc and function, changed some var names