Fixed the post test cleanup issues for website tests