Build: clean up
Tests: clean up, change dependencies and add some core tests