Fixes #25 - Adding tests for utils