Solved test issues and created temporary form