-Test checking, fix enum parsing