Tests fixes after first review