Move tests to seperate folder