Add base upperbound, port changed build deps to test target