Added tests for windows 8. Fixed indentation.