Move tests to spec folder
Seperate spec file into self contained tests