emergency commit, laptop battery low
added some plugin tests
cleanup