Added Unit Tests
even more Unit Tests!!