Tests

Resolves #28 and #26