some notes and test tweaks