Testing and cleaning
Tests and corrections