Cleaned up mode
Added another testcase to investigate windows behaviour