Remove build provided references and separate JUnit tests
Remove build provided references