Add missing files to run tests successfully
Fix test to work on W8;)