Finished isApplicable tests
Merged changes