one the road for better unittesting

properly delete old test database when invoked ...
remove reduntant code ...