Improve and finish initial error tests