[TASK] Code cleanup
[+FEATURE] Added some basic unit tests