fix unit tests
prepared for travis integration