Moved the test into an overrideable method. Cleaner and more extensible.
Basic approach works.
Works against database as well