Add few new features to test