Testing framework up
Updated test infra