Added some tests sucked from finger (cannot call it some otherwise)
Merge branch 'feature/testing' into dev