Misc updates, Test updated