Fixes a bad if check
More tests for the load data view
More tests, more coverage