Coding and fix tests
Standalone tests passed
All tests passed