Added Unit Testing for my own use