Added better errors, got rid of unnecessary user spec tests