bug fix and test updates.