New tests & method fixes