Adding tests and fixing issue with lang specified with no secondary. Closes issue #8