Attempting to fix tests and removed main.js etc