clean code
update features
custom test
test file