MOVED to multiple src folders: core and test