clean up some warnings
adding some tests