Upgraded build system to include tests