made changes to allow testing with forms