adjusted forms ready for testing