Remove redundant check from test; Remove horizontal rules from template