Tests: reworked existing tests

Moved files around, updated them for fluxification, other minor changes.