Made Tests work (no tests are going through though)