Completed basic test coverage for most of major features