Fixing some mistakes and making the test better