Update manifest; also correct main test method names