formatting and stuff
added new tests