Small fixes for self test after code review