Enhanced tests, rb bugs fixed, user ui works