Commented out UnitTest threaded thing.
Hopefully builds for android now..