Added engine, added test controller