now with more tests