Added Tests, fixed enum-code-usage, added enums