added more test coverage and removed the FE components