fixes while testing
adding tests