proper onBoard testing
Merge branch 'master' into Toy