Some optmization added (I think it works). Fully capable of running the tests.