update style and update tests to reflect this