added more tests
finished most qs