Edited tests and user form