Added tests and fixed some bugs with file names and gulp script