Added some Unit Testing for my own use