More methods, more tests