~ dirty fixed several tests