Simplify readline setup for Windows users
Properly organize supporting classes for tests