some updates to hopefully get rid of unittest soon...