move definitions to tests