Fixed support unit tests and reduced dependency on $object