Added more tests to core (68%)