working from home: eliminating bugs + implementing Junit-test