moar tests

Change-Id: I27c2c713371dd36f1381811a729ac02acdeaad54