Style updates, remove bad test