removed unnecessary wrapper functions
duplicated assignment
added comment
Merge pull request #22 from shadow-robot/B_self_test_small_fixes

Small fixes for self test after code review