GitHub #82 - Reorder methods, add tests