Unit testing fixes and extra exp.