Changed package name
Moved enum to separate class
Added tester