removing a few tests to avoid having to deal with timing issues