Some fixes on test to make it more proper
Update README