Functional tests updated, fixtures and unit test helper class