fixed tests to comply with recent type (enum) changes