Fixing NRE because of database refactoring
Removing test that is actuall _very_ wrong
Fixing test
Fixing reflection tests