Added two new manifest tests and few fixes