fixes dependences and tests