- Tests became more flexible.
- Some junk was removed from test.

Signed-off-by: 80LevelElf <salahutd@gmail.com>