Implements and fixes more tests