removed some test to save memory