anishek | a few fixture fixes