moved tests into same folder as rest of code