Added more tests and a few fixes to rebase with conflicts