Better Tests

More Tests