Missing enums in cmakelists and some updated tests