refactored test code and moved unused plugins