Expanding test application to better suit suite of Waterline tests.