cleaned up specs a bit more to match discussion