Fix some test code
Overwrite with new one