Added some unit tests for my own use