Modified tab size, added comments, removed an old test