Removed tests for the moment