Improved: function names
Extracted: test apps into own file.