Addes a few more tests