Added object tests and fixed exceptions