Remove unused database test table; Shorten name of test join table

Signed-off-by: Eric Malm <emalm@pivotallabs.com>