removed dependences and plus performance
fixed tests for travis