Re-factor test 1

Plugin currently doesn't work properly, updates needed