edited some tests and fixtures by Janusz Liro