Fixed some test behaviors