Added and fixed more tests