Increase performance
removing utils module
fixing tests