Better structure including acceptance tests