[#58 #59] fix tests and add methods to account