Cleaned up formatting with deeplists, removed redundant tests