Fix testcases, capitalize all entities