Removed unnecessary tests for the moment