Moved tests to correct directory, so now they are included...