[FIX] Fixes after testing
[ADD] Test reports updated