Improved testing, enums