ENH+TST: more unit tests
RF: use maximum 79 characters per line