kamil, u know we luv ya
tests fixes