Work on build system + test framework