Make more changes to better tests