Refactor require clauses and add remove function
Refactor test data adding to startup