updated and refactored several code bits, splitted each test to focus on one matter onlyg