Pluggin away on tests