Resolve issues building tests

Closes #37