Development

Revising tests to match implemented code