cleanup&refactor
basic tests update