Fixing assertions and scope Ofy unit test scope