Altered tests to reflect nullable database columns being Option classes.