formatting fix2
added some test + fixes