fixes for functional tests and rename test file