Adding first big test (still in progress)