Bug fix
Bug fix for initial state
Cleaned up test files using enums