Some more tests and features, some tests don't pass for unknown reasons