Split the tests into a seperate make file and add a couple more