Fix starting source
Another starting source fix
Fix comments in tests