This closes #18, renamed the acceptance tests and files with proper convention