fixed numerous tests