Requirements testing and code fixes.