minor clean ups
adding testing