adds tests, better naming