Fixes in Website Generator and Data Import test case