Add more tests and make Windows-runnable