Finished improving test case naming (closes #121)