Implemented more tests and features.