Edit Test bug fixes