moved tests to componentized directory structure as well