Removed unnecessary datatypes (aka removed the tests)