Additional tests, fixed bugs in make methods. They still can fail but
return the correct success-value.