Add missing tests and improve some others