Fixing tests and possibly fixing wercker