Began adding tests. One test still fails.