Revert "Added more test code and fixed a formatting error"

This reverts commit b3a98d6dd27041900b17daefd91b061d1d49cc7d.