Added content changes, polished testing