clean up
update tests to work with jwt