added tests @ 63% coverage will add more in the morning