adding tests, this commit will be squashed later