Remaining tests fixed apart from PropertiesBundleWriter and merge tests (currently ignored)
Fixed #287