Added a simple automated test.
Fixed last commit.