Update tests to cover the bugs that got reported leading up to 0.9