some cleanup
adding some tests