#191: improve unit tests