fixed nitpicks and cleaned up a few tests