Added option to skip overriding in wrapper
Made unit level specs prettier