Added gulp, sorted out tests