splitted long method to prepare tests
Merge pull request #2 from OskarStark/master

split long method into smaller ones