Fixes/testing improvements.