Even better test building + bug fix.