WIP on casperjs cleanup, fix intermitten test failures