minor changes to #309/#310, removed tests that fail due to phantomjs variance