Moved tests to currently recommended location