Consolidate test logic into bin/test

Signed-off-by: Aram Price <aprice@pivotallabs.com>