Better Tests

More thorough tests in progress.