Adding some fairly redundant tests, reformatting to improve readability