Cleanup specs a bit