Test re-styling and fixes