Update tests to match current structure & write code to pass