Reorganize tests, under 'spec' directory now