Project: Summer2014 - net.smurfz.michan

Test Changes
Signed-off-by: Stian Nygaard <dev@smurfz.net>