More fixes, added flags/parameters to test