Updated spec tests
Updated