Revert "kicking tests on this branch because travis is awful"

This reverts commit c444a24b7b4da904d5b9655b385ef6ab90444ad6.