Pretty major corrections + tester file