Updated tests

Resolved #11
Resolved #12
Resolved #23