Add implementation for add test
Final touches