More Tests and Transform stuff