Fix some testing