Added some test Fixes