Added more test assertions