Updated spec tests to address failed tests due to moved and renamed files