added test to proper directory
resolving merge conflicts - hope it all works :)