Fix more failing tests

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>