cleanup and organizing tests

nothing to declare =)