Added more methods to the analyser and more tests.