fixed problems with overimp
added new tests