Removed legacy tests