More cleanup: moved test file to spec directory