~ clean-up
~ fixed several tests