Merge branch 'archive-tests-separate' into 'master'

Put archive tests in their own file

Felt like an easy way to trim down main_test.go a little.

See merge request !93