divided tests into separate groups, added more methods