More JUnit testing
Merged origin into master
Fixed up/down door entry