Fix some bugs, change values passed to test frames