Refactor/tests

@ianstormtaylor refactor crazy-egg and drip