Fixes and testing form added