fixes tests and adds new