2 More Tests and fixes for them