Add tests and litl change