Adding tests, modifying show template