tests: revamped tests