Update manifest, added tests