Skip some more tests
Remove upper bounds and close #235