Added tests for most basic functionality