added more tests to magic fields mware and performed fixes