core testing, refactoring etc
Add required testing data