Changed order of methods to improve readability in IPA
Added tests for IPA