Modified build system to support tests