Clean up specs a little to use :subject