Add ability to `solo` tests
Fix potential windows issue.