Cleanup some syntax and tests