Some more tests. Started to clean up code some