Minor improvement + more tests