moved tests to a single directory