Added some tests
Prepared for more testing and added some comments