Various bug fixes (Tests and UI)