helper functions and removed some test data