Fixes/notes for unit tests