Fix error with testspec terms not being merged properly