remove DIR constants
reduce test dependency
package / apps tests separation

fix tests