TST: fixes for self testing