This commit includes tests from caitlin and bigrfish