Yay! First black box test pass, fixed bugs