extended functional tests to test for multiple items...commiting but app is still broken
removed duplication of checking for row in table