Added tests for experimenting
Merged a pull.
Renaming, restructuring existing functionality.