Test update, handles issue 16 and makes it easier to see passes and failures