Moved more tests
Working on example
Code cleanup