New test changes to cleanup
Merge pull request #3 from ivanzoosk/cleanup

New test changes to cleanup