Add -a code to tests

Closes #21