Fix bug in last commit and make sure UI test build works.