Remove odb2 since it hasn't been used in ages
Additional unit tests