removing front tests; tidying up, as per main man's advice