redefined build procedure, updated how tests are defined