Added first actual tests, and fixed an import problem in the layout file.