user fixes and tests