moved test definitions to separate file