5.6 Improve tests