More Methods + Tests