#14  #16 Update tests