fixed bug where object not found excpetion was thrown, fixed tests