breaking up integration test into smaller parts

adjusting expectations since we no longer allow services without plans

Signed-off-by: Zach Robinson <zrobinson@pivotallabs.com>