Cleaned up and fixed incorrect function specs