- Made unit tests I/O-independent