long -> Long
singleton enum pattern
Enum pattern for singleton, adding find()
Adding tests logs
rid off id
correcting package name