Fix: Tests; And replace Makefile -> Carton