Road to 100% coverage

I will add more tests soon...hopefully we will get 100% coverage before next week :)