abstrat out tests into a common method
add tests changed to this new wonderful world