Add test methods. may be ok...