Move test => spec and break out specs