Some minor changes for testing

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>