Fixed a broken test and refactored
Added Make command and some refactoring