coretests more bugs fixed