Cleane up style tests, fixed test dir resolution