Tests and refactors and code additions

This commit is getting crazy. Lots of changes and  refactors.
I dont know what im doing
gah more silly things
Added android testing example