Added tests -- passes tests