Adding a couple more test and commenting some non-deterministic test