Enum Test + fixes in collection test