changed test tasks to allow spec/test subfolder structures