fix failing execution and restructure test file