Moved wrappers into own directory
Bunch of tests for core