More test, more bugs fixed